api/admin_views.py

@@ -534,7 +534,6 @@ def statistic_member(request):

                     else:
              

                         userinfos = UserInfo.objects.filter(test_user=False, level__gte=1, status=True)
              

                 
              

                -    
              

                     #关注公众号数
              

                     mp_num = userinfos.filter(subscribe=True).count()
              

                 
              
@@ -585,7 +584,7 @@ def statistic_coupon(request):

                     if start_time and end_time:
              

                         used_coupons = UserCouponInfo.objects.filter(used_at__range=(start_time, end_time), status=True)
              

                     else:
              

                -        used_coupons = UserCouponInfo.objects.filter(status=True)
              

                +        used_coupons = UserCouponInfo.objects.filter(has_used=True, status=True)
              

                 
              

                     type_has_used_logs = list(used_coupons.values('coupon_title', 'coupon_value').annotate(num=Count('user_coupon_id')))
              

                     
              
@@ -684,6 +683,24 @@ def record_sale(request):

                         'left': left
              

                     })
              

                 
              

                +def record_sale_batch(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    admin_id = request.POST.get('admin_id', '')
              

                +    logs = json.loads(request.POST.get('logs', '[]'))
              

                +
              

                +    infos = []
              

                +    unknows = []
              

                +
              

                +    for log in logs:
              

                +        try:
              

                +            infos.append(SaleclerkSubmitLogInfo.objects.get(model_name__icontains=log['model_name'], code=log['code'], status=True))
              

                +        except:
              

                +            unknows.append(log)
              

                +    
              

                +    return response(200, 'Batch Get Record Sale Success', u'批量获取销售员销售记录', data={
              

                +        'logs': infos,
              

                +        'unknows': unknows
              

                +    })
              

                 
              

                 def model_list(request):
              

                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

api/urls.py

@@ -152,6 +152,7 @@ urlpatterns += [

                 
              

                     url(r'^admin/record/consumer$', admin_views.record_consumer, name='record_consumer'),
              

                     url(r'^admin/record/sale$', admin_views.record_sale, name='record_sale'),
              

                +    url(r'^admin/record/sale/batch$', admin_views.record_sale_batch, name='record_sale_batch'),
              

                     url(r'^admin/record/warehouse$', admin_views.record_warehouse, name='record_warehouse'),
              

                 
              

                     url(r'^admin/list/model$', admin_views.model_list, name='model_list'),